[WIP] Refactoring by client issues