Added default for cluster_id and updated keys to _ from -