Update to work with YAML