Reformatting and adding analytics