Added performance measures