Add 8.0 support