Fixed model schemas