Considerably improved the handle of model objects