Updated: Added missing attribs