Module Related changes - Intermediate