Added advanced tracking features