Tweeks to role schema