Bugfix/optional performance data