Some changes to the API based on review comments