Moved the unit availability to a new class.