GII sub-modules support - see #871