Added more of model, fixing #moveFile