Some new additions for analytics demo