Updated to handle more stats