Added APIKeyAuthenticator and dependent code