safe queues and simpler api