Improved documentation and syntax