Made API changes according to our discussions