Added 'patches' support