Moved the wrappers to the model to improve dependencies
Removed remains from a merge