Add AOP support