Change api to standard rest