Added CoreModule & NonCoreModule qualifiers