Added support to 8.60 - 9.54