Adding support for H2