Changed roles permissions logic