Refactored the class so that the primary parsing libs are in an external class