Fixed model contract issues