Extended existing Utils and Factory

Extended existing Utils and Factory