Integrated AOP concepts for Exception handling and some other bug fixes