added import support