refaactor(handler) : change to client