Models after fixes finished