EpochFactory updated