[-] Added attributes to analytics config
[-] Updated analytics code and other minor tweaks