Draft for RestService
Fixed merging conflicts