Improved API keys