Working #2870 : Decoupling the Gem from GenModel - Minor changes