Adding functional tracking service