Modified the meta data storage when we have an Entity inside an Entity.