Improved documentation with new system