Added girth and circumference invariants