Added new attribute set to better handle tracking attributes