Updated inline with API changes