Fixed yaml_spec.
Fixed persistence.