Major changes with models to improve OO design