Expanding on end-message parsing and more modularization