Fix mapping specific extensions to types