Move TimestampDecorator and default_timestamp_decorator method
Accept options when decorating a timestamp
Accept options when decorating multiple timestamps