Adaption of REST Call system;