Renamed Type to Wrap
Some changes in Denotation