Made some usage changes based on initial integration testing with Storm