Adding key checks