Why isn't this done in the analytics modules (the logic is already there)?