Static Method change #GOLD-8