Adding tracking feature