Create merged persistence context and audit endpoint / client
Simplify aop expression
Remove unnecessary namespace