Refactoring just a little SystemWrapper API.