DB setup changes