API refactored - update documentation