Updated it to skip the EpNameWriter class