More API
Solving conflicts