Adding initial parsing code