Initial support for multiple components