Added support for relative paths