Added in a timestamp extractor