Fix implementation to allow for multiple queues by using mixins