Massive update. More friendly to different OS per guest