Added more tracking markup