Adding stuff to gather more stats