Improve documentation
Add missing imports