Change: More instances of the YAML databases now possible