Updated statistics functions, added more discriminators within the stream struct.