Moving Date to separate class and renaming to DamsDate