Changed Machine class to adapt it to OS requirements