Added modular parsing