Refactoring in proparation for @AroundConstruct
Add @AroundConstruct support