Changes to how API keys are handled