replaced classic entity overrides with Objects implementations