Added support for AWS messaging