Work on 4.0 support