Added Yaml Implementation
Merge fix
Reflecting refactor on merged branch