CE-1125 Convert the method to dynamic one