WIP: Add new command line options for bdm v2