Added keys functionality