Restored previously wipeout getId() methods for entities