Proccessed review comments + spi changes from hazelcast