More restructuring and support for eor.