Refactored config
Added google analytics support