Add reverse has-a relationship to intent class
Remove switch add dictionary