FIX: Check for existing key