Changed model definition