Refactor of the library
Merged conflicts