some refactoring
Refactoring and client.dbTapApi().edit