Improved Object Wrappers