Synchronized with latest API changes
Synchronized with latest improvements