Simplified import lines for both files