Add full match class - as before