Adding CPG factory