Fixing handler and improving YAML to TOML conversion