Added some extension-based code.