Add entities and better deferrals handlers.