changes for rest api services and other fixes