Model changes for Fairmile D