Updated model to refect the server correctly