Added NXT patch support