moved raw to Model