改进模型类

Change-Id: I00664dfb9a487e41ac3492c826d0afabb85a6fc1