Added basic date extraction