Working on improving client API