Added ability to keep track of attribute data