added template and component data objects