Added typeMapping