Partial TOT parsing added