Fixed: changed properties to attributes