Ok Peter. I have created an issue regarding to the refactoring on the whole source base...
https://github.com/hazelcast/hazelcast/issues/2073