Improve command line flexibility using Baker