Added analytics to options