Add helper methods to create cluster and storedefs