Separated the metadata creation logic from parsing  logic
Separated the metadata logic from parsing logic
Completed story FFPOC-8