Updated permissions
Re-organized for plugins