Added command line options to builder
TODO++ :(