Add API-Key support