Improvements in AOP library.