framework structure fixes