Update main and models