Added support for API keys and App IDs.