Added a simple patch mechanism