JSR 330 version of client (initial checkin)