Added two pattern classes