Removing dependency on OS