merge with master -> usage of models like in stub
added setModels()