Updated to attribute name changes