Adding skip path support