Add email & attrib to fields