Added wrapper traits
Merge pull request #751 from bvssvni/newdesign

Added wrapper traits