Add suffix based template matching