Add support for path lookup