Analytics improved