Import class fix