Added manual type mapping