Merging branch AllRefactor in api