Add import support