Refactoring: Renamed all 'attribute' to 'property'