Added ability to associate with configurations/features