Optimized imports to avoid * imports