Final touches to Availability