Fixed loader to use Yaml mapper for yaml files