Add info class and change some display methods