Add support for path