Better import script & date management