Fix decorator to use date fields
Parse date fields