Added support for analytics configuration, adjusted defaulted config file