Add support for other rules

Add new patterns