Change namespace and add support for Aggregate Message.