Adding permission info
Merge remote-tracking branch 'rodrigo/auto-permission'