Added analystics
Prep for URL masking