changed TimeInterval and Timestamped to class