Add 9.4 compatibility