Move beforeNotify execution into BeforeNotify class