Refactored properties