Implement timestamp behavior

addresses #2215