Added better command line support