#8 AbstractAspect has been enhanced but it is not tested. Some remove