Adding support for version 19