Improved role defs