Refactored the code to put pointcut into aop: around