Update dependencies
Refactored parsers to increase cohesion