Added some AOP stuff.