Parsing of qup files improved, Yaml included