Add optional modules for Google Analytics. bugid:111550