Adjust API Structure
Fix conflict