Fixed few bugs & basic Generation of JSON is ready