Change GET API and comments