Added User-based API key support.