Added support for using either .yaml or .json