@kelvin-chappell and I worked on this together - this new type is more generic and further work could be done to re-factor the AWS credentials into this type.  The new ApiCredentials case class has a service parameter - would be fastly in this case.