Added requiered modification in other files