Fix Attr order
Fix doc