Extended Document definition
Added list of attributes directly to the element
Added file
Changed tests to use new attribute model