Issue #442 - Optimize imports