Changed model a bit