Add option to return calc fields in date format