Improving TypeSystem section and Drawing analysis section