Updats to work with relative paths