Added more tracking attributes