Added performance functionality