Fixed Model issues