Attempt to simplify analytics integration