Solving conflicts
Adding new api method