Added in command line support. Provided storage directory support