Add 5.0 support