added more control of wxs cluster