[FEATURE] Add json and fix broadcast