Minor imports optimization