Improved all wrappers
added object wrapper
improved wrappers