database-setup updated