Adding API key management