More changes
Adjusted docs according to latest API changes