Fixed model dependency errors