Made some of the hard code values part of the extension.