Switch to @access pointcut, add an additional logic for strategy