Revised model spec