Add support for easier command line execution