Updated extractType for correct types;