Add producers/consumers registry, fix specs