Added extra attributes in tracking