adding in support for clusters