updated Model class internals