Worked on better callback structure for clusters