Add support for Component