Smarter wrapper making