Updated documentation and API