Improved inline documentation and backwards compatibility.