Added new classes and json file