Minor changes to support RESTFull interface