Changed interface from ds to db