Updated for discoutils 0.22