Optimize Imports in Core module