Updates for new permission system