Moved wrapping into core