Update example modules to work with #36