Merge "Add support for paths."