Sync with implementation

Adapted docs so that they reflect what has been implemented.