Changes in database constructors