Added support for optional path argument