Started to add multi-OS recognition