Added move model, expanded template