Added patch support