Small changes required on your APIs