Improved availability check