Updates dependencies, refactors parser