Added database generation stuff