Updated protoqueue based on feedback from @julianharty