fix load and import bug
add more flexibility