[TASK] Refactoring for more consistency API