[PATCH] refactored role/privilege model