Fixed optional nested messages parsing