Added class parsing