Simplifying the analytics library