Updated the controllers, replaced GetHighestId with GetNewId()