Revert "Remove unneeded clusters fields"
Revert "Remove unneeded clusters fields"

This reverts commit b8fa2c2669c7a687bbcb6c1bcd4de8aa087e62e5.

ysavary/WindMobile2-Server,ysavary/WindMobile2-Server,ysavary/WindMobile2-Server,ysavary/WindMobile2-Server