Moved yaml stuff over to YamlHelper