Add Full Commentation to parsing part