[Analytics] Fix circular dependency issues