Improved documentation
Renamed attributes