Few improvements in wall class