Making it work with restserver