Fixed all usecases over binary protocol