Add entity groups
Fix permissions