Add member classes and modified Json file structure