Updating to support relative paths