* Make refactoring
* Add new models to use it later