Add in cluster_prefix support