Changed type mapping