Add structure changes, main controller