NoProtocol added, updated samples