Changed internal api calls