Add better detection of usage requirments.