Updated library to match the refactored version of the "xtd" library.