Removed tb_json dependency