Order now preserved, refactored to use ObjectWrapper