Namespaced, added sqs and sns