Added ColorWrapper