[feature] Refactoring api for more token oriented