Client draft.
Fix get property name
Merge branch 'feature-client'