If something more generic makes more sense, wouldn't it also make sense to be handled by other package (other than audit)?