some changes for remote api management