Merge "Modify url mapping to make API more Restful"