Feature #46, refactored model service
Feature #46, refactored controller in order to test it