attribute-list changed to construct, fixed optional constructs in messages