Added more benchmark related code