I guess we need a version check here sicne we are changing the protocol?