Added extra attributes for tracking