User properties refactor for simpler usage