Refactored class layout for a better management of Eoc