Patches for modules support