Add more key permissions checks