Make model prefix handling optional