H2 Storage converted to singleton