Added ability to use attributes to name fields