Updates for latest API changes