Update API changes as per discussion