RestApi improvements