Add model spec, Make bug fix