Added ability to add attributes after the fact