Removed check for getId() function