Added structure for multiple operating systems