Add command line arguments; Remove DB.fileName