Updated import functionality