Wrappers improvements