Fixed imports for both