Change import mode to make it more reusable