Changed import namespace logic