Changed GetId()