Changes to get YAML session working