Further changes for permissions2