Adding ability to set a custom namespace for an entity