Cluster support
Minor updates