Change models on client and server side to match