#32 Add required permission.
#32 #47 Refactorings