Moved everything into YAML datastore