Date Converter method changed to class