Adding m2 lifecycle mapping