Removed dependence on local path