Add support for submoduled classes