Fix setup. Improvement importing