API refactoring. Documentation update/