Addd many more component type support, with token support, too.