Added uniquify
Added YAML mode