Adding support for version 9 in addition to version 8