Change to using Date instead of String where needed.