Adding appfactory related changes