Improved handling of site Module variable