Fixed db, added specific vendor tables