Added analytics sub-system