Reworked edit to be a better API
Another refactor of cluster config. With this change, new cluster api should be easier