Major change: 1. Add stub 2. Refactored CommModule