Added raw statement listing mode