Added optional path