New changes to api