Adding support for multiple versions of GI/DB