Added database name to options