Initial work for patching support