Added path support