Module 2: Analytics

Module 5: Cloud

Added prefix and suffix