Extracted a couple of classes from parser