Improved documentation
Include better Haddocks for generated module