Add suppport for message builder and fix message structure/initial
parsing