Fixed Model + Added put messages