Refactor privilege (refs #17)