Made a change allowing subscription ID to be None