Add epoch to avoid problens on upgrade