Updates according to latest API changes