I think we should refactor the whole client management at a later time.