Updated to support other OSs