Improved wrappers