Entities are added after event handlers are established, added lock
Added support for entities whose meshResource.uri is set later