move to ClientProperties