Adds structure changes after first review