Bugfix and additional columns added to output