fixed parser bug, extracting message builder interface