Improved parser and important date shortcuts