Added support for out of the box component templates