Added fixes to make single class.