Improve import from Locamotion