Changes to Hazelcast code