Audit service refactoring.