Doing some changes to apis