Feat/refactoruserclientintofeatures