Change equals method, add new private methods, update route generate code