Added componentFactory