Added the availability unit wrapper.