Adjust module imports for consistency