Converted to JSON/Methods Added