Processed review comments yusuf and fixed some spi stuff due to hazelcast api changes