Allow both old and new style role defs