Use correct import, move to top
Complete (?) version compatibility