Need to change some model objects