Developed cluster map further