Elements instead of attributes
Reformatted to better match XML structure
Minified versions