Some changes to API