Reorganized some methods in YAMLDataSource