Update permissions

+ Update permission handling to differentiate between group and role
Update permissions