Removed dependency on System