Changed model layout