Model changes for vanilla