Implemented AOP capabilities into the handlers. I order to be able to keep up with the changes in the main branch I opted to implement it without changing the underlying logic, which of course translates in some messy code. Hopefully the will introduce AOP in the future (missing unit tests, will add them later)