Changes for api