Update the API after feedback from Idan and Dan