Refactored some code and made import of data after an update easier