Added support for different paths