GH-5 Updated defined modules