Make sure integration is 100% optional, increase efficiency of
integration related checks