Refactored ImportController to partialise date handling