Refactor/update users roles permissions #257

See #257