REST server improved