Optimzing imports