added entity object related logic