Lots of updates for newest Hazelcast version