Improve inject availability detection