Classes hierarchy restructuring
Annotated AOP example