Better encapsulation of parser data