Added Command line support