Some changes in api