Added Comment object
Modified __data to _data