Yes, that would be better, as long as our components our rendered for the right content types. Currently, it's ab test code which is deciding when to render the component.