Removed dependency on path variable