Improved documentation and change in properties