Add outputs count and rename unique state