Added rudimentary import support