Fixed to_json not returning a hash in date_field
Added association field