MEE code structure changes