Analytics functionality extended.