Add availability checking