Continue RefName analyzer

More features as discussed