Improved unit matching
Fixed concatenation by position
Improved unit matching