Added class info to optimally manage parsed data