Changes to classes to make parser more flexable