Improved integration and documenation