Added benchmark support