improved modularization/interface of epos