Added custom path support
Added custom path support