Refactored importing mechanism and model