Attrib Builder and other updates