Fixing imports with 3.x way