Update analysis modules to reflect new type scheme