Separate out sub loading and fixes issue with vulnerability subscription