Added support for service keys