Task #26: AOP support WIP 2