Add inner Builder utility class generation - resolves #10