Added support for use-system-yaml flag