Add support for use with cloud.narwhalgroup.com