Removed the availability unit wrapper. Adapted to the new armor
availability class.