Additional ocaps for modules

This implements #349.