Adding path support