DRYed model spec; api spec added