Created correct mapping of core types Int16, Int32, Int64, UInt16, UInt32, UInt64.
Merge.