Added detection of OS and system architecture