Various changes code to role user