Add more support of patchers