Re: Port of builders to Magritte-Model