Refactored property attributes