Updates to accomodate cassandra deployments