Another rework of imports