Added better response metrics