Improve proper using of property decorator and logic