Added support for keyword parsing (today, yesterday, etc)