- Make benchmark script working again
- Turn static function into static member