Manager implementation updated due to API changes