improved the new protocol resolving framework