Add support for module blocks