Issue #1 - Add client feature