Modified DataBaseMaker for commandline tools