Added support for Badajoz and command line