Some modifications to allow parameteres when parsing