Fixed trap not being taken in account in all entities creation/deletion methods.