Client interface improvment

@eura note that you also have the option described here: