Made some API changes