Entity Id moved to the base entity #201

Closed kushal-arora-fw closed 7 months ago