(added) - changed json data to include master, class and name instead of just name