157 Adding type conversions to 2 step mapping capabillity