Put parser methods in new file