Fix comment
Add DateAndTimeExtractor