Some changes to update/draw structure