Added user tracking feature