Defaults now properly setting if not previously set.