Added EntityIdHandler

Change-Id: Iadc1dc2e42326f1b01f923d56e24860e36f99b22