Additional Sysprep support