Added classes to support graphing information