Unify property value handling