Update to allow propagate to be fully skipped
Update annotate to classify names