Improve REST api in the project