First work on handling import of features