Add some more Catalyst component