New and improved analytics tables