Improve restful server