Added additional utilities and extensions.