Register entities in more places