H2 integration fixed