Added failsafes for the eventual separation of core components into new free/premium marketplace