Change fetch to use timestamp