Removed dependency on subprocesses