Added support for dynamic paths