New Expansion module to fix GUI issues