Fixed XML - & is supposed to be &amp; and added back in constructors (correctly annotated)