Add options to control progress output and db name