Added Generic entity factory and entity_types proxy response