Added XML attributes
Added attribute cases