Added defined json structure, added individual feature