Added database and all options