03.07.14: Make changes in model and makers