Added Type Id Into DAO