Automated cluster mapping added