Add methods add_timestamps and remove_timestamps
Add methods add_timestamps and remove_timestamps (w/ fix)