Refactoring auditing in prep for allowing filtering