Moved parser methods to separate module