Merge "Updated to include all VFModule members"