Catch up with structure changes