added epoch support