Role and UserRole tweeks