Make sure all dao calls occur before updating structure