Added support for optional path parameters