Small changes in manager + New Eng Cluster module