Updated to fit with new role creation standards