Aeron - structure changes