Add symbols and names to regex matcher, get composition working better