Feature/cfy 748 improve rest client