Added in Json specific entities where necessary, as well as filled out existing entity behavior and data