Adding clusters and fixing build