replaced hard-coded ExtensionType constants
replaced more hard-coded ExtensionType constants