Reflect API changes and fixed setup