Add waiting helpers for modules