Changed parsing class structure