Added type-specific matrix