Navaneeth - Moving data facotry and config into the Gem <Navaneeth>