added support for API keys again