Added CommonTypeSystem solution