Moved Availability.h import to a proper place