Make object structure less jarring