Re: Unit initialization infrastructure