Modify to convert NSDate values to dictionaries