Model Refactoring!

Signed-off-by: vukis <vukis@bk.ru>