Updated extractType for new types;