Added Type. Need new Db back end