update to Properties instead of Attributes