Added better support for relative paths